Some small updates for sonar issues