More small POM and code changes