Scons fixes

cc: @chadaustin