Fixes with config setups -_-