Fixed a couple of bugs in the control unit