Fix var declarations