View & Permission fixes