Compilation fix from a bad paste earlier.
Type constant values updated + Makefile fixed to do proper diffs.