Fixes for ...FromEnd -> ...Negative