FIX debugging changes