Resolve bugs that were introduced in the Viewer. It's all working OK now