calculated indicators : fixes