Misc. improvements.