* [FIX] Various fixes to adapt to the new situation.