Fixed few mvn build errors