Fixes for sequential modes