Minor container improvements.