Minor tweaks to fix annoying quirks.