Dependency fixups and bundler warning