Fixing IDs and upgrading Guava