Minor changes for comment integration with Drupal