Map and manifest tweaks