Some container improvements