Some bootstrap upgrade & fixes