Compiler and tool names need to be updated in Makefile. Also fix some patch offsets while we are at it