Address some maven build warnings