Review fixes (restored separate init statement for services)