Fix a few checkstyle