[fix] multiple fixes