Further configuration fixes