Bootstrap optimizations