Mathias fixes for the control node