Refine some changes