Minor changes to PayMaster class