guava and other fix