Update Makefile and Toolchain fixups