Fix some variable problems.