Some tweaks to make the advanced map more consistent.