[UPD] Minor changes