Mavenize a few more libraries