Handle some midnam edge-cases