Updates for new Guava version