Fixes for service and config file handling