Fixed the permission override checks in a couple of methods