Fix coverage issues