Fix problems w/requires that mess up bundler