Misc fixes, permission change