Clean up warnings and dependencies.
23 files changed