header bug fixes