Fixing auth issues