Fix a couple things for checkstyle