Correcting small bugs from forks' merge. Update the pom to serge's package building.