Incorporated code review comments and handled CI failures