Tidied up some Maven warnings