Fix service commands.
Other minor fixes in service bundle.