Bugfixing authentication + adapters