More Area Viewer related fixes