Fixing configuration issues