Fixes for switching encounters