A few more improvements specific to windows