Another round of fixes
Change permission