A couple of fixes for the style changes.