[fix] various small fixes