Some misc tweaks.