Fixes and doc changes.