Fixed windows related issues