Fixed configuration issues of various kinds