Apply suggestions re: bundle.