Added missing variable types.