fix issues found in symbol map code review