Fixes issues caused by https://drupal.org/node/2169605.
Adds corrections to broken functionality caused by Drupal 8 API changes.