Minor fixes to messages and permssions