More permissions fixes - just one function determining access now