fix remaining issues on new puppetmaster

if this pans out i might be able to go hack on the zabbix server!