Tweaks to support .NET bindings after change to double