Tweak various things to make bundler happy.