clockwwork recovery build fixes

Conflicts:
	core/Makefile