Paymaster & knight fix