Fix checkstyle and findbugs errors