diff --git a/e107_handlers/bbcode_handler.php b/e107_handlers/bbcode_handler.php
index 25c08c63d..dfcfa0574 100644
--- a/e107_handlers/bbcode_handler.php
+++ b/e107_handlers/bbcode_handler.php
@@ -386,7 +386,7 @@ class e_bbcode
 		 *	@todo - capturing output deprecated
 		 */
 		ob_start();
-		$bbcode_return = eval($bbcode);
+		$bbcode_return = eval($bbcode); //FIXME notice removal
 		$bbcode_output = ob_get_contents();
 		ob_end_clean();
 
diff --git a/e107_handlers/file_class.php b/e107_handlers/file_class.php
index 4ec069aec..3f4eba969 100644
--- a/e107_handlers/file_class.php
+++ b/e107_handlers/file_class.php
@@ -440,7 +440,7 @@ class e_file
 
         $cp = $this->initCurl($remote_url);
 		curl_setopt($cp, CURLOPT_FILE, $fp);
-
+		curl_setopt($cp, CURLOPT_TIMEOUT, 20);//FIXME Make Pref - avoids get file timeout on slow connections
        	/*
        	$cp = curl_init($remote_url);
 
@@ -452,6 +452,7 @@ class e_file
        	*/
 
         $buffer = curl_exec($cp);
+		//FIXME addDebug curl_error output - here see #1936
        
         curl_close($cp);
         fclose($fp);