Fix Maven warnings
Merge branch 'fix-maven-warnings'