Fixed up windows compatibility