Smal map fixes