cfx toolchain and small compile fix

Conflicts:
	Makefile