Fix new Map loader in non-debug mode, DRMP fixes/tweaks