More obj.type fixes