More scons fixes