More work towards a true standalone binary