Bugs causing rearrangement of workouts

Other Corecircle issues: