Minor FUEL fixes

Workarounds for some bugs.