World of Diving: A few more auto-fixed surfaces

Fixes watch faces, possibly more.
World of Diving: Fix Scuba-scooter display wandering to the right