fixing findbugs issues