Minor maintenance in POM
Minor maintenance in POM and Message files