Fix all but Linking errors in Control.cpp