Fix control tables