Fix Coverage Issues.