Fix things broken from previous refactoring due to insufficient mvn clean diligence