minor bundle optimizations