Fixes to refactored sequencer code