Minor fixes to puppet::master