Fix container headers