More tweaks to items classes.