Fixup last of the styling issues