Minor fixes and changes.