#305 Fix minor issues with permission changes