Fixed configuration management bugs