Merge in some Linux changes from @humble

These should be two mundane checkins.