diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
index 1f119c96145e..4edd7a15c07f 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -450,6 +450,7 @@ void Parser::handleComponent() {
             reader_.getUrl() + ": <component> is missing \"uri\" attribute",
             css::uno::Reference< css::uno::XInterface >());
     }
+#ifndef DISABLE_DYNLOADING
     try {
         attrUri_ = rtl::Uri::convertRelToAbs(reader_.getUrl(), attrUri_);
     } catch (const rtl::MalformedUriException & e) {
@@ -457,6 +458,7 @@ void Parser::handleComponent() {
             reader_.getUrl() + ": bad \"uri\" attribute: " + e.getMessage(),
             css::uno::Reference< css::uno::XInterface >());
     }
+#endif
 }
 
 void Parser::handleImplementation() {
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 6a5ace502d85..7d871423062d 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -541,6 +541,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
     // First test library names that aren't app-specific.
     static lib_to_component_mapping non_app_specific_map[] = {
         { "bootstrap.uno" SAL_DLLEXTENSION, bootstrap_component_getFactory },
+        { "bootstrap.uno.a", bootstrap_component_getFactory },
         { "configmgr.uno.a", configmgr_component_getFactory },
         { "expwrap.uno.a", expwrap_component_getFactory },
         { "fastsax.uno.a", fastsax_component_getFactory },
@@ -568,6 +569,7 @@ Reference< XInterface > SAL_CALL loadSharedLibComponentFactory(
 
     if ( pSym == NULL)
     {
+        // The call the app-specific lo_get_libmap() to get a mapping for the rest
         const lib_to_component_mapping *map = lo_get_libmap();
         for (int i = 0; pSym == NULL && map[i].lib != NULL; ++i)
         {