Map stuff and missing tag fix.