Fixes for new Guava version