[Bug 1489] Improvements from WineX should be merged in