Coverage

Fixing some more coverage issues.