Fixing command line parsing for service