MYLOC-59 - Fixing builds