Minor variable fixes