Robot type fixes