Fix even more errors so html_output unit test no longer crashes.