[Build] Mapextractor fixup