A few quick fixes for Map errors.