Fixes on the controlling functionality