Changes to pass checkstyle checks.