Fix a couple derps

Conflicts:
	core/Makefile