[fix] Small changes