Some small fixes for code coverage.

Although code coverage should be possible with Clang I haven't figured
it out yet. It compiles and links under Clang but does not produce any
coverage output.