[FIX] Various fixs