Fixes and additions.