Fixed build issues on other workstation