COMP: Various minor superbuild-related fixes