Minor corrections to respect Drupal standard codings