Mavenization - different improvements.