[fix] small fixes of small issues