var mismatch fixes