[*] small fixes