Fixed some dll separation issues.

14 files changed