Minor changes to appease Sonar...