Fixed config issues which were causing crashed at runtime.