Merge pull request #1208 from masahir0y/build

Build: trivial fixes