More type margin fixes