Fix up some stuff with the experimental oceans, should be safe to try out now.