Services fixes