Fixed style problems.
Merge branch 'next' into sam_style