Fixed some stuff broken by inventory change.