more fixes for drush-ops/drush#177
final fixes for drush-ops/drush#177