Fix coverage and Makefile