Some fixes on the Authorization system.