[FIX] More fixes