fixes some findbugs problems