compile error on mac
Cross platform fixes
Merge branch 'master' into weight-new