Some coverage fixes.