Upgraded guava to be consistent everywhere