Fix compilation errors and some style issues.
Enforce 90-character line length limit on lines changed in this set of commits.