Findbug-suggested fixes (encoding/final)