Bug fixes and config changes.