[fix] some fixes.