Various fixes for maven build