Item loading and saving fixes