diff --git a/eeschema/libarch.cpp b/eeschema/libarch.cpp
index 6d6e84ea37..274f066e9b 100644
--- a/eeschema/libarch.cpp
+++ b/eeschema/libarch.cpp
@@ -113,6 +113,7 @@ bool SCH_EDIT_FRAME::CreateArchiveLibrary( const wxString& aFileName )
     try
     {
         cacheLib->Save( false );
+        cacheLib->EnableBuffering( false );
     }
     catch( ... /* IO_ERROR ioe */ )
     {
diff --git a/eeschema/sch_legacy_plugin.cpp b/eeschema/sch_legacy_plugin.cpp
index 4dba5b7a01..970baffbe7 100644
--- a/eeschema/sch_legacy_plugin.cpp
+++ b/eeschema/sch_legacy_plugin.cpp
@@ -2411,10 +2411,10 @@ LIB_PART* SCH_LEGACY_PLUGIN_CACHE::loadPart( FILE_LINE_READER& aReader )
 
         if( locked == 'L' )
             part->LockUnits( true );
-        else if( locked == 'F' )
+        else if( locked == 'F' || locked == '0' )
             part->LockUnits( false );
         else
-            SCH_PARSE_ERROR( "expected L or F", aReader, line );
+            SCH_PARSE_ERROR( "expected L, F, or 0", aReader, line );
     }