Various little tweaks.