More of the same tweaks to Makefiles and fixed code to clear the compiler warnings.