Fixing coverage problems.
Fixing some coverage issues.