Finish fix some issue