diff --git a/ConfirmEdit_body.php b/ConfirmEdit_body.php
index 0733002c7..f88bf4ed4 100644
--- a/ConfirmEdit_body.php
+++ b/ConfirmEdit_body.php
@@ -2,14 +2,10 @@
 
 class ConfirmEditHooks {
 	static function getInstance() {
-		global $wgCaptcha, $wgCaptchaClass, $wgExtensionMessagesFiles;
+		global $wgCaptcha, $wgCaptchaClass;
 		static $done = false;
 		if ( !$done ) {
 			$done = true;
-			wfLoadExtensionMessages( 'ConfirmEdit' );
-			if ( isset( $wgExtensionMessagesFiles[$wgCaptchaClass] ) ) {
-				wfLoadExtensionMessages( $wgCaptchaClass );
-			}
 			$wgCaptcha = new $wgCaptchaClass;
 		}
 		return $wgCaptcha;
diff --git a/MathCaptcha.class.php b/MathCaptcha.class.php
index 9b9cde22f..9e3d89153 100644
--- a/MathCaptcha.class.php
+++ b/MathCaptcha.class.php
@@ -23,7 +23,7 @@ class MathCaptcha extends SimpleCaptcha {
 
 		$form = '<table><tr><td>' . $this->fetchMath( $sum ) . '</td>';
 		$form .= '<td>' . Xml::input( 'wpCaptchaWord', false, false, array( 'tabindex' => '1' ) ) . '</td></tr></table>';
-		$form .= Xml::hidden( 'wpCaptchaId', $index );
+		$form .= Html::hidden( 'wpCaptchaId', $index );
 		return $form;
 	}