Fixes for scons build files.