fix issues raised by findbugs