Fix some container bugs