More wither knight fixes