CS fixes (EOF newline)