More fixes to has_access switching