More header check fixes