Fix up container stuff