Misc. fixed related to CItem