Fixed configuration issues