Final changes to Wine HW 9