Druid fixes