container adapter + small fixes