couple of maven tidy ups