Fixed some findbugs warnings