Add coverage target.  Misc fixups