Fix table and branch diagram