ScopeFX build fixes, plus candidate build