fixing all build issues on linux by pulling downstream changes