[fix] some fixes