Fix CISession entity and typos