Small misc improvements.