Minor misc. improvements.