Fix Authentication checks