#327 Fixed findbugs warnings