Fix compilation warnings. - mostly related to indentation.

Apply to 2.8 branch