Fix some findbugs errors