Fixing other small config issues