Fix some additional issues with permissions