Fixes for variation back and forth moves