diff --git a/core-bundle/contao/classes/Hybrid.php b/core-bundle/contao/classes/Hybrid.php
index <HASH>..<HASH> 100644
--- a/core-bundle/contao/classes/Hybrid.php
+++ b/core-bundle/contao/classes/Hybrid.php
@@ -83,7 +83,7 @@ abstract class Hybrid extends \Frontend
 		// Load the model
 		if ($this->classFileExists($strModelClass))
 		{
-			$objHybrid = $str\ModelClass::findByPk($objElement->{$this->strKey});
+			$objHybrid = $strModelClass::findByPk($objElement->{$this->strKey});
 
 			if ($objHybrid === null)
 			{
diff --git a/core-bundle/contao/dca/tl_content.php b/core-bundle/contao/dca/tl_content.php
index <HASH>..<HASH> 100644
--- a/core-bundle/contao/dca/tl_content.php
+++ b/core-bundle/contao/dca/tl_content.php
@@ -1322,11 +1322,11 @@ class tl_content extends Backend
 				break;
 
 			case 'XHTML':
-				$syntax = 'html';
+				$syntax = 'htmlmixed';
 				break;
 
 			case 'JavaScript':
-				$syntax = 'js';
+				$syntax = 'javascript';
 				break;
 
 			case 'PHP':
[Core] Two minor issues (Hybrid and CodeMirror)