Updates for cross platform (Mac/Win) builds