MYLOC-60 More fixes