diff --git a/ffmpeg_wrapper_ui/ffmpeg_wrapper_ui.module b/ffmpeg_wrapper_ui/ffmpeg_wrapper_ui.module
index 362b8d8..c86d184 100644
--- a/ffmpeg_wrapper_ui/ffmpeg_wrapper_ui.module
+++ b/ffmpeg_wrapper_ui/ffmpeg_wrapper_ui.module
@@ -405,7 +405,7 @@ function ffmpeg_wrapper_ui_node_action_form(&$form, &$form_state) {
         '#type' => 'markup',
         '#value' =>
           '<pre>' . $ffmpeg_object->command . '</pre>' .
-          '<pre>' . checkmarkup($ffmpeg_object->output) . '</pre>'
+          '<pre>' . check_markup($ffmpeg_object->output) . '</pre>'
       );
     }
   }
@@ -730,8 +730,8 @@ function ffmpeg_wrapper_ui_js() {
   // Render the part of the form we need
   $output = theme('status_messages') . drupal_render($converted);
 
-  print drupal_to_js(array('status' => TRUE, 'data' => $output));
-  exit();
+  // Final rendering callback.
+  drupal_json(array('status' => TRUE, 'data' => $output));
 }