Fix block implementations

Issue on drupal.org: https://www.drupal.org/node/2304161