Updates for site-wide scons build (rather than local version).