Tweaks on makefiles. Fix errors in vec4014