Bugfix/better deltas

Has been tested with Anduril.

@stryderjzw @shanejonas