findbugs/checkstyle: fixed some issues