Added missing variable assignments.