Bringing winhammer up to date