more sconscript fixes