fix issues flagged by findbugs (#147)