Fix windows issues