[fix] several fixes