Fixing uses
Increasing coverage