core: Mop up Windows breakage