DATAMONGO-635 - Fixed some Sonar warnings.