Fixed findbugs issues