[fix] - some small fixes