diff --git a/src/ModelCustomization.ts b/src/ModelCustomization.ts
index 5ec3937..0041e10 100644
--- a/src/ModelCustomization.ts
+++ b/src/ModelCustomization.ts
@@ -35,20 +35,24 @@ function removeIndicesGeneratedByTypeorm(dbModel: Entity[]): Entity[] {
     dbModel.forEach(entity => {
         entity.indices = entity.indices.filter(
             v =>
-                !v.name.startsWith(`sqlite_autoindex_`) &&
-                (v.name !== "PRIMARY" && v.primary)
+                !(
+                    v.name.startsWith(`sqlite_autoindex_`) ||
+                    (v.primary && v.name === "PRIMARY")
+                )
         );
         const primaryColumns = entity.columns
             .filter(v => v.primary)
             .map(v => v.tscName);
         entity.indices = entity.indices.filter(
             v =>
-                v.primary &&
-                v.name !==
-                    namingStrategy.primaryKeyName(
-                        entity.tscName,
-                        primaryColumns
-                    )
+                !(
+                    v.primary &&
+                    v.name !==
+                        namingStrategy.primaryKeyName(
+                            entity.tscName,
+                            primaryColumns
+                        )
+                )
         );
         entity.relations
             .filter(v => v.joinColumnOptions)
diff --git a/src/ModelGeneration.ts b/src/ModelGeneration.ts
index fe27e46..e50ebc4 100644
--- a/src/ModelGeneration.ts
+++ b/src/ModelGeneration.ts
@@ -73,7 +73,9 @@ function removeUnusedImports(rendered: string) {
         .split(",");
     const restOfEntityDefinition = rendered.substring(closeBracketIndex);
     const distinctImports = imports.filter(
-        v => restOfEntityDefinition.indexOf(`@${v}(`) !== -1
+        v =>
+            restOfEntityDefinition.indexOf(`@${v}(`) !== -1 ||
+            (v === "BaseEntity" && restOfEntityDefinition.indexOf(v) !== -1)
     );
     return `${rendered.substring(0, openBracketIndex)}${distinctImports.join(
         ","