Fixes for the dbg module.