Fixed the header issue and a warning in a demo.