Fixing some configuration problems