First round of fixing controls checks