Changes due to https://drupal.org/node/2259243, fixes to views functionality.