more mismatch fixes