Make permissions work better