Clean up warnings and dependencies.
16 files changed