span/p fixes