More osm type fixes