Fixed two bugs where the drupal vid was not being properly handled.