Docfix: More doc type fixes