Early load fixes (no load-at-startup or static Sender referencing)

I think these two fixes will help me in my integration efforts!