[fix] Small fixes