Improved var name
Fix deps
Fix makefile
Fix deps again