more Scalar conversions fixes
3 files changed