diff --git a/callback_create.go b/callback_create.go
index 4734d65e..52e9369c 100644
--- a/callback_create.go
+++ b/callback_create.go
@@ -36,7 +36,7 @@ func Create(scope *Scope) {
 
 		returningKey := "*"
 		if scope.PrimaryKey() != "" {
-			returningKey = scope.PrimaryKey()
+			returningKey = scope.Quote(scope.PrimaryKey())
 		}
 
 		if len(columns) == 0 {
diff --git a/postgres.go b/postgres.go
index b2624448..2229e7b1 100644
--- a/postgres.go
+++ b/postgres.go
@@ -4,8 +4,9 @@ import (
 	"database/sql"
 	"database/sql/driver"
 	"fmt"
-	"github.com/lib/pq/hstore"
 	"reflect"
+
+	"github.com/lib/pq/hstore"
 )
 
 type postgres struct {
@@ -66,7 +67,7 @@ func (s *postgres) PrimaryKeyTag(value reflect.Value, size int) string {
 }
 
 func (s *postgres) ReturningStr(tableName, key string) string {
-	return fmt.Sprintf("RETURNING \"%v\".%v", tableName, key)
+	return fmt.Sprintf("RETURNING %v.%v", s.Quote(tableName), key)
 }
 
 func (s *postgres) SelectFromDummyTable() string {
@@ -97,7 +98,7 @@ func (s *postgres) HasColumn(scope *Scope, tableName string, columnName string)
 }
 
 func (s *postgres) RemoveIndex(scope *Scope, indexName string) {
-	scope.Raw(fmt.Sprintf("DROP INDEX %v", indexName)).Exec()
+	scope.Raw(fmt.Sprintf("DROP INDEX %v", s.Quote(indexName))).Exec()
 }
 
 var hstoreType = reflect.TypeOf(Hstore{})