Fix makefile files

- implement review from MZI