[fix] small fixes