Maps: Some minor modifications.