Fix some drupal standards coding errors