Fix makefile targets.
wip