Fixed some findbugs issues