Bug fixing: starter and manifold