Feature/linked container fixes