Updated Linux & windows build