Added some missing dependencies to SConstruct
Catch some more messages instead to prevent shutdown