Fixed build issues with master branch