Fix export declaration support