Fixed some changes