Fixed labels not appearing, fixed elevation restriction near water and map edges