Fix errors and warnings from Drupal.org review