Bootstrap fixes.