diff --git a/catavatar/templates/settings.tpl b/catavatar/templates/settings.tpl
index 086250ea..33563ffe 100644
--- a/catavatar/templates/settings.tpl
+++ b/catavatar/templates/settings.tpl
@@ -11,14 +11,14 @@
 	<img src="{{$basepath}}/catavatar/{{$uid}}?{{$uncache}}">
 	<p>{{$setrandomize}}</p>
 	<div class="settings-submit-wrapper" >
-		<input type="submit" name="catavatar-usecat" 
-			class="btn btn-primary settings-submit" value="{{$usecat}}" />
+		<button type="submit" name="catavatar-usecat"
+			class="btn btn-primary settings-submit" value="{{$usecat}}">{{$usecat}}</button>
 		
 		<div class="btn-group" role="group" aria-label="...">
-			<input type="submit" name="catavatar-morecat" 
-				class="btn btn-default settings-submit" value="{{$morecat}}" />
-			<input type="submit" name="catavatar-emailcat" {{if !$seed}}disabled{{/if}}
-				class="btn btn-default settings-submit" value="{{$emailcat}}" />
+			<button type="submit" name="catavatar-morecat"
+				class="btn btn-default settings-submit" value="{{$morecat}}">{{$morecat}}</button>
+			<button type="submit" name="catavatar-emailcat" {{if !$seed}}disabled{{/if}}
+				class="btn btn-default settings-submit" value="{{$emailcat}}">{{$emailcat}}</button>
 		</div>
 	</div>
 </div>
diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php
index 3a8898b4..25b94047 100644
--- a/phpmailer/phpmailer.php
+++ b/phpmailer/phpmailer.php
@@ -20,7 +20,7 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'a
 function phpmailer_install()
 {
 	Hook::register('load_config'         , __FILE__, 'phpmailer_load_config');
-	Hook::register('emailer_send_prepare', __FILE__, 'phpmailer_emailer_send_prepare', 5);
+	Hook::register('emailer_send_prepare', __FILE__, 'phpmailer_emailer_send_prepare');
 }
 
 function phpmailer_load_config(App $a, ConfigFileLoader $loader)
diff --git a/securemail/securemail.php b/securemail/securemail.php
index 3f9cadb2..fb801a4c 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -19,9 +19,9 @@ require_once __DIR__ . '/vendor/autoload.php';
 function securemail_install()
 {
 	Hook::register('addon_settings', 'addon/securemail/securemail.php', 'securemail_settings');
-	Hook::register('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post', 10);
+	Hook::register('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post');
 
-	Hook::register('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare', 10);
+	Hook::register('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare');
 
 	Logger::log('installed securemail');
 }
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 8bfa1737..bac4871b 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -495,30 +495,26 @@ function twitter_action(App $a, $uid, $pid, $action)
 
 	Logger::debug('before action', ['action' => $action, 'pid' => $pid, 'data' => $post]);
 
-	try {
-		switch ($action) {
-			case 'delete':
-				// To-Do: $result = $connection->post('statuses/destroy', $post);
-				$result = [];
-				break;
-			case 'like':
-				$result = $connection->post('favorites/create', $post);
-				if ($connection->getLastHttpCode() != 200) {
-					Logger::warning('Unable to create favorite', ['result' => $result]);
-				}
-				break;
-			case 'unlike':
-				$result = $connection->post('favorites/destroy', $post);
-				if ($connection->getLastHttpCode() != 200) {
-					Logger::warning('Unable to destroy favorite', ['result' => $result]);
-				}
-				break;
-			default:
-				Logger::warning('Unhandled action', ['action' => $action]);
-				$result = [];
-		}
-	} catch (TwitterOAuthException $twitterOAuthException) {
-		Logger::warning('Unable to communicate with twitter', ['action' => $action, 'data' => $post, 'code' => $twitterOAuthException->getCode(), 'exception' => $twitterOAuthException]);
+	switch ($action) {
+		case 'delete':
+			// To-Do: $result = $connection->post('statuses/destroy', $post);
+			$result = [];
+			break;
+		case 'like':
+			$result = $connection->post('favorites/create', $post);
+			if ($connection->getLastHttpCode() != 200) {
+				Logger::warning('Unable to create favorite', ['result' => $result]);
+			}
+			break;
+		case 'unlike':
+			$result = $connection->post('favorites/destroy', $post);
+			if ($connection->getLastHttpCode() != 200) {
+				Logger::warning('Unable to destroy favorite', ['result' => $result]);
+			}
+			break;
+		default:
+			Logger::warning('Unhandled action', ['action' => $action]);
+			$result = [];
 	}
 
 	Logger::info('after action', ['action' => $action, 'result' => $result]);