Minor fixes and reformat

This PR brings in minor fixed and reformat following the recent merge of the big Ubuntu enablement changeset