Bootstrap fixes