fix some build issues
Merge remote-tracking branch 'origin/v0.2.x'