Issue #419: Fixing notices when upgrading from Drupal 7.