Fix Container/Stack bugs