0000024: fixed possible bugs found by findbugs