Minor fixes and additions.