Fixed Item related bugs