Minor changes to debug helper