Few checkstyle fixes