Fixes to installation and service startup