Fixed findbugs complaints