Auth cleanup/fixes