More fixes for auth changes in 2.6