Fix pom and misc