diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java
index 919fcc0e..a73c954a 100644
--- a/src/main/java/org/bukkit/RegionAccessor.java
+++ b/src/main/java/org/bukkit/RegionAccessor.java
@@ -210,10 +210,11 @@ public interface RegionAccessor {
      *
      * @param location The location to spawn the entity
      * @param type The entity to spawn
+     * @param <E> The class of the {@link Entity} to spawn
      * @return Resulting Entity of this method
      */
     @NotNull
-    Entity spawnEntity(@NotNull Location location, @NotNull EntityType<?> type);
+    <E extends Entity> E spawnEntity(@NotNull Location location, @NotNull EntityType<E> type);
 
     /**
      * Creates a new entity at the given {@link Location}.
@@ -236,10 +237,11 @@ public interface RegionAccessor {
      *                      randomisation logic for their spawn.
      *                      This parameter is hence useless for any other type
      *                      of entity.
+     * @param <E> the class of the {@link Entity} to spawn
      * @return the spawned entity instance.
      */
     @NotNull
-    public Entity spawnEntity(@NotNull Location loc, @NotNull EntityType<?> type, boolean randomizeData);
+    public <E extends Entity> E spawnEntity(@NotNull Location loc, @NotNull EntityType<E> type, boolean randomizeData);
 
     /**
      * Get a list of all entities in this RegionAccessor
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
index 2bbe8b46..1197cb8a 100644
--- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java
@@ -335,8 +335,8 @@ public interface Block extends Metadatable, Translatable {
     /**
      * Checks if this block is empty.
      * <p>
-     * A block is considered empty when {@link #getType()} returns {@link
-     * BlockType#AIR}.
+     * A block is considered empty when {@link #getType()} returns a block type for which
+     * {@link BlockType#isAir()} is true.
      *
      * @return true if this block is empty
      */
diff --git a/src/main/java/org/bukkit/entity/Minecart.java b/src/main/java/org/bukkit/entity/Minecart.java
index fc2c1f54..b7eb96a6 100644
--- a/src/main/java/org/bukkit/entity/Minecart.java
+++ b/src/main/java/org/bukkit/entity/Minecart.java
@@ -117,7 +117,7 @@ public interface Minecart extends Vehicle {
      * Sets the display block for this minecart.
      * Passing a null value will set the minecart to have no display block.
      *
-     * @param blockData the block type to set as display block.
+     * @param blockData the block data to set as display block.
      */
     public void setDisplayBlockData(@Nullable BlockData blockData);