More stuff added back to scons build