Fix Guava Error and some minor tweaks