Updated Linux code in sync with Win changes (wip).