Further fixes SCons integration