diff --git a/src/main/java/org/springframework/persistence/graph/Graph.java b/src/main/java/org/springframework/persistence/graph/Graph.java
index 6bb78bdb5..f667b574a 100644
--- a/src/main/java/org/springframework/persistence/graph/Graph.java
+++ b/src/main/java/org/springframework/persistence/graph/Graph.java
@@ -8,6 +8,8 @@ import java.lang.annotation.Target;
 import org.springframework.persistence.graph.neo4j.NodeBacked;
 import org.springframework.persistence.graph.neo4j.RelationshipBacked;
 
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
 public @interface Graph {
 
 	@Retention(RetentionPolicy.RUNTIME)
diff --git a/src/main/java/org/springframework/persistence/graph/neo4j/Neo4jNodeBacking.aj b/src/main/java/org/springframework/persistence/graph/neo4j/Neo4jNodeBacking.aj
index 7e057ad67..7b5b09e15 100644
--- a/src/main/java/org/springframework/persistence/graph/neo4j/Neo4jNodeBacking.aj
+++ b/src/main/java/org/springframework/persistence/graph/neo4j/Neo4jNodeBacking.aj
@@ -100,7 +100,7 @@ public aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<Graph.E
 		return this.underlyingNode.createRelationshipTo(nb.getUnderlyingNode(), type);
 	}
 
-	public long NodeBacked.getId() {
+	public Long NodeBacked.getId() {
 		return underlyingNode.getId();
 	}