[*] few fixes