permission fixes and tweaks