Fixing small config issues

Fixing small config issues