minor mismatch fixes