Container fixes