Fix var name issues