Further guava enhancements