Fix and update makefile.