Fixing some configuration issues