fixed issues from Drupal.org