Minor tweeks while implementing mylocalmap