remedy a few more findbugs issues (#147)