Update VehicleUtils for Java 8
Fixed bugs.