[fix] fixes