Drupal standards fixup