Fix build

Change-Id: I2e951b1b059f40468eb4a8435eb537c937dbd772

Conflicts:
	core/Makefile

Signed-off-by: Fusion-Rom <dragon7780@hotmail.nl>
Fix --block

Change-Id: Iadf8e4650d74cc41ff62918e9592d17802db6683

Conflicts:
	core/Makefile

Signed-off-by: Fusion-Rom <dragon7780@hotmail.nl>