Fixes to the Tools makefile