Fix Windows related issues