More misc improvements.