Drush fixes