Fix some variable access.