Fixes to work with DEBUG_CONTAINER