Fix some underscore placement issues
Merge branch 'passenger_tuning' into dynaguppy