Some further tweaks for prettyness.