EraseFwd and EraseBck fix.
Merge branch 'x-fix' into master2