Updated for latest IFSharp build