Fixes to the maven build