diff --git a/captcha.inc b/captcha.inc
index 6af73a6..2caffcd 100644
--- a/captcha.inc
+++ b/captcha.inc
@@ -191,8 +191,8 @@ function _captcha_required_for_user($captcha_sid, $form_id) {
  */
 function _captcha_get_description($lang_code=NULL) {
   // If no language code is given: use the language of the current page.
-  global $language;
-  $lang_code = isset($lang_code) ? $lang_code : $language->language;
+  $language = language(LANGUAGE_TYPE_INTERFACE);
+  $lang_code = isset($lang_code) ? $lang_code : $language->langcode;
   // The hardcoded but localizable default.
   $default = t('This question is for testing whether or not you are a human visitor and to prevent automated spam submissions.', array(), array('langcode' => $lang_code));
   // Look up the configured CAPTCHA description or fall back on the (localized) default.
diff --git a/captcha.info b/captcha.info
deleted file mode 100644
index 888094b..0000000
--- a/captcha.info
+++ /dev/null
@@ -1,11 +0,0 @@
-name = CAPTCHA
-description = Base CAPTCHA module for adding challenges to arbitrary forms.
-package = "Spam control"
-core = 7.x
-configure = admin/config/people/captcha
-
-files[] = captcha.module
-files[] = captcha.inc
-files[] = captcha.admin.inc
-files[] = captcha.install
-files[] = captcha.test
diff --git a/captcha.info.yml b/captcha.info.yml
new file mode 100644
index 0000000..dd17edd
--- /dev/null
+++ b/captcha.info.yml
@@ -0,0 +1,5 @@
+name: 'CAPTCHA'
+description: 'Base CAPTCHA module for adding challenges to arbitrary forms.'
+package: Spam control
+core: 8.x
+configure: admin/config/people/captcha
\ No newline at end of file
diff --git a/captcha.module b/captcha.module
index cc0432c..f907b9f 100644
--- a/captcha.module
+++ b/captcha.module
@@ -417,7 +417,7 @@ function captcha_form_alter(&$form, &$form_state, $form_id) {
 
   // Add a warning about caching on the Perfomance settings page.
   if ($form_id == 'system_performance_settings') {
-    $icon = theme('image', array('path' => 'misc/watchdog-warning.png', 'width' => 18, 'height' => 18, 'alt' => t('warning'), 'title' => t('warning')));
+    $icon = theme('image', array('path' => 'core/misc/watchdog-warning.png', 'width' => 18, 'height' => 18, 'alt' => t('warning'), 'title' => t('warning')));
     $form['caching']['captcha'] = array(
       '#type' => 'item',
       '#title' => t('CAPTCHA'),