Various changes around messages and permissions