[Fix] Various fixes