tidy pass on initial linux changes
Merge commit 'fce61d5327a7d920250be772cc6b9412d47c9f36' into linux