* [FIX] Various fixes for the integration of codebases.