Adjust some changes