[*] minor fixes