Map: Fixed a truck load of compile errors.