Various old unsubmitted tweaks.