Fix issues brought up in Project Application queue - https://drupal.org/node/2142465#comment-8809891