Combine run and run_later blocks
Fix blocks in controls_run