Fixed dependencies and moved to more recent Guava.