Some fixes to get container2 add module to work as expected [#909]