Fixup checkstyle and warnings.