Make map viewport values more robust