Fix control structures