More findbug fixes