CS fixes

- EOF ending