Another temp rubber removal fix.
Fix bug with headers in handout mode.