Fix some changes