Move back to 8.0 and fix warnings
Dropoff locations changes