Few map fixes and changes