Resto druid fixes