Few changes fix