Fix makefile and manifest