Fixes more coverage annotation issues