Fix blend
Refine makefiles