[fix] tweaks