diff --git a/gograph/gograph.go b/gograph/gograph.go
index 28ce74081..21f2966e2 100644
--- a/gograph/gograph.go
+++ b/gograph/gograph.go
@@ -104,9 +104,11 @@ func (db *Database) Set(fullPath, id string) (*Entity, error) {
 		return nil, err
 	}
 	defer conn.Close()
+	// FIXME: is rollback implicit when closing the connection?
 	rollback := func() {
 		conn.Exec("ROLLBACK")
 	}
+	// FIXME: use exclusive transactions to avoid race conditions
 	if _, err := conn.Exec("BEGIN"); err != nil {
 		return nil, err
 	}
diff --git a/gograph/gograph_test.go b/gograph/gograph_test.go
index f21d8bb85..5c12128ca 100644
--- a/gograph/gograph_test.go
+++ b/gograph/gograph_test.go
@@ -22,7 +22,7 @@ func destroyTestDb(db *Database) {
 func TestNewDatabase(t *testing.T) {
 	db := newTestDb(t)
 	if db == nil {
-		t.Fatal("Datbase should not be nil")
+		t.Fatal("Database should not be nil")
 	}
 	defer destroyTestDb(db)
 }