Fix windows related issues