Changes to allow use of standard version of scons .. still debugging.