Fixing coverage and a few nits