Fixes and config changes.