diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jCatalog.java b/src/org/olap4j/driver/xmla/XmlaOlap4jCatalog.java
index f9f65d2..4a71efc 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jCatalog.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jCatalog.java
@@ -154,7 +154,7 @@ public String getName() {
         return name;
     }
     
-    public List<String> getAvailableRoles() {
+    protected List<String> getAvailableRoles() {
     	return roles;
     }
 
diff --git a/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java b/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
index 5df85e0..29e6966 100644
--- a/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
+++ b/src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java
@@ -126,7 +126,7 @@ abstract class XmlaOlap4jConnection implements OlapConnection {
      * calls as part of &lt;PropertyList/&gt;.<br />
      * Can be passed to connection via connection string properties.
      */
-    private Properties databaseProperties;
+    private final Properties databaseProperties;
 
     private boolean autoCommit;
     private boolean readOnly;
@@ -740,7 +740,7 @@ public String getRoleName() {
     }
 
     public List<String> getAvailableRoleNames() {
-        Set<String> roleNames = new HashSet<String>();
+        Set<String> roleNames = new LinkedHashSet<String>();
         try {
             for (Catalog catalog : getOlapCatalogs()) {
                 List<String> catalogRoles =