Improvements to scons build.