Add: various improvements and fixings for single file deployment support.