diff --git a/core/model/SQLQuery.php b/core/model/SQLQuery.php
index acf2391a5..9c270b49a 100755
--- a/core/model/SQLQuery.php
+++ b/core/model/SQLQuery.php
@@ -453,7 +453,7 @@ class SQLQuery {
 			if($this->groupby) {
 				$countQuery = new SQLQuery();
 				$countQuery->select = array("count(*)");
-				$countQuery->from = array('(' . $clone->sql() . ') as all_distinct');
+				$countQuery->from = array('(' . $clone->sql() . ') all_distinct');
 
 				return $countQuery->execute()->value();
 
diff --git a/security/Permission.php b/security/Permission.php
index b51f0d52f..a85540fd7 100755
--- a/security/Permission.php
+++ b/security/Permission.php
@@ -246,9 +246,9 @@ class Permission extends DataObject {
 				UNION
 				
 				SELECT \"Code\"
-				FROM \"PermissionRoleCode\" AS PRC
-				INNER JOIN \"PermissionRole\" AS PR ON PRC.\"RoleID\" = PR.\"ID\"
-				INNER JOIN \"Group_Roles\" AS GR ON GR.\"PermissionRoleID\" = PR.\"ID\"
+				FROM \"PermissionRoleCode\" PRC
+				INNER JOIN \"PermissionRole\" PR ON PRC.\"RoleID\" = PR.\"ID\"
+				INNER JOIN \"Group_Roles\" GR ON GR.\"PermissionRoleID\" = PR.\"ID\"
 				WHERE \"GroupID\" IN ($groupCSV)
 			")->column());