diff --git a/source/java/org/alfresco/repo/domain/query/ibatis/CannedQueryDAOImpl.java b/source/java/org/alfresco/repo/domain/query/ibatis/CannedQueryDAOImpl.java
index 3a671f6171..4f56f26a96 100644
--- a/source/java/org/alfresco/repo/domain/query/ibatis/CannedQueryDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/query/ibatis/CannedQueryDAOImpl.java
@@ -130,15 +130,29 @@ public class CannedQueryDAOImpl extends AbstractCannedQueryDAOImpl
         {
             throw new IllegalArgumentException("Query result offset must be zero or greater.");
         }
+        
+        // TODO MyBatis workaround - temporarily support unlimited for nested result maps (see also below)
+        /*
         if (limit <= 0 || limit == Integer.MAX_VALUE)
         {
             throw new IllegalArgumentException("Query results must be constrained by a limit.");
         }
+        */
+        
         String query = makeQueryName(sqlNamespace, queryName);
         try
         {
-            RowBounds bounds = new RowBounds(offset, limit);
-            return (List<R>) template.selectList(query, parameterObj, bounds);
+            if ((offset == 0) && (limit == Integer.MAX_VALUE))
+            {
+                // TODO MyBatis workaround - temporarily support unlimited for nested result maps (see also above)
+                // http://code.google.com/p/mybatis/issues/detail?id=129
+                return (List<R>) template.selectList(query, parameterObj);
+            }
+            else
+            {
+                RowBounds bounds = new RowBounds(offset, limit);
+                return (List<R>) template.selectList(query, parameterObj, bounds);
+            }
         }
         catch (ClassCastException e)
         {
diff --git a/source/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQuery.java b/source/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQuery.java
index 9999e7cea4..7226376eb5 100644
--- a/source/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQuery.java
+++ b/source/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQuery.java
@@ -161,7 +161,7 @@ public class GetAuthoritiesCannedQuery extends AbstractCannedQueryPermissions<Au
         return true;
     }
     
-    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @SuppressWarnings({ "unchecked"})
     protected List<AuthorityInfo> applyPostQuerySorting(List<AuthorityInfo> results, CannedQuerySortDetails sortDetails)
     {
         final List<Pair<Object, SortOrder>> sortPairs = (List)sortDetails.getSortPairs();