Fix little issues with config