A Few Trivial EOF Tweaks