Small corrections to add missing calls needed by DEBUG mode.