Minor map tweaks and NGS-> NCS