Minor SCons enhancements