More item handling tweaks.