Fixed some findbugs stuff