[fix] More fixes