Minor changes to auth system