Fix thrush and xdo