Minor updates to e2 fuel functions
Merge remote-tracking branch 'upstream/master'