guava and other fixes