diff --git a/source/AirGQL/Lib.hs b/source/AirGQL/Lib.hs
index 80a404d..dd8bfff 100644
--- a/source/AirGQL/Lib.hs
+++ b/source/AirGQL/Lib.hs
@@ -135,7 +135,7 @@ instance FromField ObjectType where
               { errSQLType = "Object Type"
               , errHaskellType = "String"
               , errMessage =
-                  "\"" <> show sqlData <> "\" is not a vaild object type"
+                  "\"" <> show sqlData <> "\" is not a valid object type"
               }
         ]
 
@@ -999,7 +999,7 @@ sanitizeSql sql =
     -- TODO: Remove after
     --       https://github.com/JakeWheat/simple-sql-parser/issues/27
     & replaceWithSpace "if not exists" ""
-    -- TOOD: Remove after
+    -- TODO: Remove after
     --       https://github.com/JakeWheat/simple-sql-parser/issues/37
     & replaceCaseInsensitive "insert or abort " "insert "
     & replaceCaseInsensitive "insert or fail " "insert "
@@ -1198,7 +1198,7 @@ sqlite =
         , "nothing"
         , "notnull"
         , -- although "null" is on the official list of keywords, adding it here
-          --  seems to break "select NULL as ..." statemenets
+          --  seems to break "select NULL as ..." statements
           -- , "null"
           "nulls"
         , "of"
diff --git a/tests/Spec.hs b/tests/Spec.hs
index 5000c3b..e4d2f42 100644
--- a/tests/Spec.hs
+++ b/tests/Spec.hs
@@ -271,8 +271,8 @@ testSuite = do
                 , datatype = "INTEGER"
                 , datatype_gql = Just $ stringToGqlTypeName "Int"
                 , select_options = Nothing
-                , notnull = False
-                , isUnique = False
+                , notnull = True
+                , isUnique = True
                 , isOmittable = True
                 , isGenerated = False
                 , dflt_value = Nothing
@@ -477,7 +477,7 @@ testSuite = do
                 , datatype_gql = Just $ stringToGqlTypeName "Int"
                 , select_options = Nothing
                 , notnull = False
-                , isUnique = False
+                , isUnique = True
                 , isOmittable = True
                 , isGenerated = False
                 , dflt_value = Nothing