[UPDATE] small fixes