Update deprecated Guava calls