Re-fixed ScopeFX build