Fix some service declarations.