COMP: Enabled windows compatibility