Fix some issues in this module reported by findbugs