Fix controls and implicit equations