Small fixes around debugging