Small fixes + use _export_dependency method to export addresses