POM fixes

Additional fixes