Multi map support fixes