Fixing build for new superbuild format