Fixes for authentication methods