Fixing some more checkstyle warnings.