[FIX] Various fixes