Fix some outdated code in DEBUG