BUG: More superbuild fixes