Linux, small adjustments
Merge branch 'master' into external