Porting some fixes from Bitcoin, EasyWinBuilder v0.3