[fix] - small fixes