Fix some services declarations