Some more EOF fixes
Some USE fixes