Bootstrapper-Related Improvements