Extra methods, Permissions checking fixes