Fix control surface issues for editor GUI
Prep for 0.14.6