[fix] various fixes