some findbugs fixes