Further map improvements