Changes made for fixing auth issues