Makefile and Config tweak part 1.

Applied tweaks from HydraCore modified source files.
To be continued...