Stage old stuff; fix Makefile