Fixed bug where progress events can raise an exception randomly
Fixed some missing references