Fix: issues reported by Sonar