Fixes for split of auth and resource server