bugfixes for new auth