Fixes for switch_back refactor.