Further updates to attempt to fix EOF