Fix up sonar findbugs warnings