Extract interfaces, fix some services.xml issues