Some minor improvement to our Viewer plugin (#222).