MOAR fixes for Debugger integration, Environment ids are now in sync