Add: a few improvements for single file deployment.