fixes some findbugs issues