Fix some issue on windows