Further improvements in F# version