variable minor mismatch fixes