Debugger; Changes to MapEngine use