diff --git a/server/src/main/java/com/vaadin/data/provider/HierarchyMapper.java b/server/src/main/java/com/vaadin/data/provider/HierarchyMapper.java
index 7f423b39c97..040be6cf2fc 100644
--- a/server/src/main/java/com/vaadin/data/provider/HierarchyMapper.java
+++ b/server/src/main/java/com/vaadin/data/provider/HierarchyMapper.java
@@ -38,7 +38,7 @@
  * anything.
  *
  * @author Vaadin Ltd
- * @since
+ * @since 8.1
  */
 class HierarchyMapper implements Serializable {
 
diff --git a/server/src/main/java/com/vaadin/ui/UI.java b/server/src/main/java/com/vaadin/ui/UI.java
index 31de66c558d..536b2603ddb 100644
--- a/server/src/main/java/com/vaadin/ui/UI.java
+++ b/server/src/main/java/com/vaadin/ui/UI.java
@@ -1812,25 +1812,25 @@ public Registration addWindowOrderUpdateListener(
      * Sets the drag source of an active HTML5 drag event.
      *
      * @param extension
-     *         Extension of the drag source component.
+     *            Extension of the drag source component.
      * @see DragSourceExtension
-     * @since
+     * @since 8.1
      */
     public void setActiveDragSource(
             DragSourceExtension<? extends AbstractComponent> extension) {
-        this.activeDragSource = extension;
+        activeDragSource = extension;
     }
 
     /**
      * Gets the drag source of an active HTML5 drag event.
      *
      * @return Extension of the drag source component if the drag event is
-     * active and originated from this UI, {@literal null} otherwise.
+     *         active and originated from this UI, {@literal null} otherwise.
      * @see DragSourceExtension
-     * @since
+     * @since 8.1
      */
     public DragSourceExtension<? extends AbstractComponent> getActiveDragSource() {
-        return this.activeDragSource;
+        return activeDragSource;
     }
 
     /**