[Misc] Update pom file and minor cleanups