Bugs fixes, achieving mouf2 migration

Signed-off-by: Kevin Nguyen <k.nguyen@thecodingmachine.com>