Little tweaks to fix the new line-height problems