Improved support for Wintel