a few fixes for CLI service manipulation

@kornypoet , heads up, just some CLI fixes from today