Another debug helper changes