Drupal fixes