Misc improvements.