MYLOC-86 Updates following code review.