Further debugging changes