fix build errors

Conflicts:
	Makefile

Conflicts:
	Makefile