Fix of compilation bug + Makefile is working again.