[Bug 884496] Small style fixes for new styles.
Merge pull request #518 from juliaelman/884496-style-fixes

[Bug 884496] Small style fixes for new styles.