Fixed issues with authorities