Small debug changes mostly