Container methods fix