Fix up some stuff for horses