Further debugging work.