Fix issues with adding/removing presets during transitions