[fix] Constructor fixes