Fix new controls properly