Updating some bits in Maven configuration to fix build issues.