Fix makefile targets.
Update manifest.