Fixed and trimmed some POM definitions