Improve Windows mole support