Bugs from auth cleanup