Bug fixes, minor changes.