Fix missing AbstractServiceController. Other fixes.