Fix some EOF

Fix 5 EOF