Update Makefile and fix compilation.