diff --git a/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.1-FKIndexes.sql b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.1-FKIndexes.sql
index f8f12fc7b0..2b293de85f 100644
--- a/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.1-FKIndexes.sql
+++ b/config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.1-FKIndexes.sql
@@ -9,7 +9,7 @@
 -- The MySQL InnoDB Dialect has special support for foreign keys.
 
 -- Remove pointless duplicated FK indexes
-ALTER TABLE alf_global_attributes DROP INDEX FK64D0B9CF69B9F16A;
+ALTER TABLE alf_global_attributes DROP INDEX FK64D0B9CF69B9F16A;(optional)
 
 --
 -- Record script finish
diff --git a/source/java/org/alfresco/repo/importer/view/NodeContext.java b/source/java/org/alfresco/repo/importer/view/NodeContext.java
index b718a3811e..600fa9d3de 100644
--- a/source/java/org/alfresco/repo/importer/view/NodeContext.java
+++ b/source/java/org/alfresco/repo/importer/view/NodeContext.java
@@ -421,8 +421,8 @@ public class NodeContext extends ElementContext
      */
     public AspectDefinition determineAspect(QName defName)
     {
-        AspectDefinition def = null;
-        if (nodeAspects.containsKey(defName) == false)
+        AspectDefinition def = nodeAspects.get(defName);
+        if (def == null)
         {
             def = getDictionaryService().getAspect(defName);
         }
diff --git a/source/java/org/alfresco/repo/processor/TemplateServiceImpl.java b/source/java/org/alfresco/repo/processor/TemplateServiceImpl.java
index 7b59724ba7..a5b8fc5fcf 100644
--- a/source/java/org/alfresco/repo/processor/TemplateServiceImpl.java
+++ b/source/java/org/alfresco/repo/processor/TemplateServiceImpl.java
@@ -78,7 +78,11 @@ public class TemplateServiceImpl implements TemplateService
      * @see org.alfresco.service.cmr.repository.TemplateService#getTemplateProcessor(java.lang.String)
      */
     public TemplateProcessor getTemplateProcessor(String engine)
-    {        
+    {
+        if (engine == null)
+        {
+           engine = this.defaultTemplateEngine;
+        }
         return this.processors.get(engine);
     }