BUG: Fix ImageViewer superbuild and other inconsistencies