Minor work on Control.cpp