Bug fixes, changes.