Fixes for maven build.