Modifications to various SConscripts to fix bug in cleanup option