Tenative fix for hidden bugs in extension loading.