Fixed configuration related issues