FIX: added fixes for new auth