Updates concerning logging, and some SonarQube issues