Small tweaks to margin collapsing