Map and design update fix