Little previewer fixes