More item fixes.