Fix some variable token issues.