Fix more errors in map.h/map.c