438190 findbug improvements