Fixed more EOL issues