Small edits to makefile, build script and defconfig