findbugs/checkstyle: fixed some findings