SConstruct bugfixes