forgotten findbug stuff fixed