Bug fixes and changes.