Updated for SCons 2.3.2 and 2.3.3