Some margin fixes.