Fix crossbuild errors
Merge branch 'origin/master'