fixes to CR, puppetmaster loads data correctly