EOF header fix, and more