misc checkstyle fixes