Bug fixes and other small changes.