Fixing a few bugs in the authorization branch.