Derp fixes

Conflicts:
	Makefile