Fix issues in first-three