Improve mock location a debugging