Bug in retaining Z at run start

I seem to be dealing with a bug in either TinyG or tgFX in relation to starting a run. If the ‘set machine position’ is set and nothing is jogged prior to running, all works fine. But if the Z is jogged at all after ‘set machine position’ then the first drop back down into the run is foreshortened by the depth increment, however subsequent moves correct this. The error only occurs on the very first drop into the material. The error can be avoided by either never jogging the machine after the ‘set machine position’ (but this can be difficult without some alternative method to set the Z height) or creating some extra initial machine action prior to all the actual ones which absorbs the error prior to cutting material. If anyone else has seen this and has suggestions better than my work arounds, please share.

Also, when the job is complete, the values of the XY and Z get reset randomly making rezeroing very difficult, and it does not return to the zero origin, it just stops above the last tool move. Are fixes or workarounds for these issues available?
I am running tgFX 2404 edge, and I have a tinyg only about 2 weeks old, but not sure about firmware.