Fix different sonar issues