MOBILE-250 Debugging tool improvements