Fix some service registry related issues