Fixes to saving when workout_component_id is blank