Fix small findbugs issues
Small pom cleanup