More configuration fixes, esp. for automatic doc