More security manager fixes