Fixing build issues on linux