Fix issues in the initial review except for the trait assignment page