fixed some findbugs issues