[All] Various fixes