Container and header fixes