updated 1.8 and fixed Guava calls