Fixed tiny issues in map parsing