Fixed definitions (two changed gate categories).