Finished authentication fixes