Fixes for split of auth resource server