Fix/correct build issues #647

Closed maxflintoff-tomtom closed 1 week ago