Update checkstyle.xml and fix problems