Bootstrapping fixes