some SConscript fixes