Coverage fixups.