Minor updates to get build working

Just 3 minor updates required to get Maven to build Payara.