Fixed issues with superbuild