More Drupal 6.x-7.x compatibility fixes.