Updates to fix EOF errors.