Cleanup viewer issues