Fix excess map padding
Enable subsegment milestone markers