Some fixes before getting rid of the share relax