Took care of some warnings that polluted Drupal 7