More type tweaks :/