fix easy issues raised by findbugs (#147)