POM fixes for Maven 3 compatibility