Fixed some dll separation issues.

3 files changed