itemviewer fixes