Some fixes and additions.