[Changes] Fix code issues