WorldView Fixes