Updates for Windows compile