Fixes to flarb_mapbuilder, implementation can be considered as correct