Some more fixes to measure
Merge branch 'lerkendal-move-maplib' of https://code.barentswatch.net/stash/scm/bw/maplib into lerkendal-move-maplib