build corrections
Merge remote-tracking branch 'gh/mts' into mts