[Bug 1489] New: Improvements from WineX should be merged in