Fixes and permissions update