Fix two sonar issues