Corrections so that builds with DEBUG work