Re-add DEBUG flag to pass broken tests