Fix
s'more fixes

Conflicts:
	core/tasks/kernel.mk