Fixed puppetmaster service issues