Fix for the stream too few bytes problem. Also added some additional properties to log events