[Misc] Windows fixes