Fix makefile and wrong imports