multiple fixes per user review: http://drupal.org/node/1948624#comment-7208170